revert the latest stamp increment changes, as it broke stuff for trees

Sat Mar 30 15:19:24 2002  Kristian Rietveld  <kris@gtk.org>

        * gtk/gtktreemodelsort.c: revert the latest stamp increment changes,
        as it broke stuff for trees

diff --git a/ChangeLog b/ChangeLog
index a90b6b16af63ec8d8e6164e3b18054dcc6ef1753..115aeca8fa0b779b3c2f8ce8d785aa9d60618231 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Mar 30 15:19:24 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreemodelsort.c: revert the latest stamp increment changes,
+       as it broke stuff for trees
+
 Fri Mar 29 18:09:18 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkaccelgroup.c (gtk_accel_group_query): Call 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index a90b6b16af63ec8d8e6164e3b18054dcc6ef1753..115aeca8fa0b779b3c2f8ce8d785aa9d60618231 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Sat Mar 30 15:19:24 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreemodelsort.c: revert the latest stamp increment changes,
+       as it broke stuff for trees
+
 Fri Mar 29 18:09:18 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkaccelgroup.c (gtk_accel_group_query): Call 

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index a90b6b16af63ec8d8e6164e3b18054dcc6ef1753..115aeca8fa0b779b3c2f8ce8d785aa9d60618231 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+Sat Mar 30 15:19:24 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreemodelsort.c: revert the latest stamp increment changes,
+       as it broke stuff for trees
+
 Fri Mar 29 18:09:18 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkaccelgroup.c (gtk_accel_group_query): Call 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index a90b6b16af63ec8d8e6164e3b18054dcc6ef1753..115aeca8fa0b779b3c2f8ce8d785aa9d60618231 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Sat Mar 30 15:19:24 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreemodelsort.c: revert the latest stamp increment changes,
+       as it broke stuff for trees
+
 Fri Mar 29 18:09:18 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkaccelgroup.c (gtk_accel_group_query): Call 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index a90b6b16af63ec8d8e6164e3b18054dcc6ef1753..115aeca8fa0b779b3c2f8ce8d785aa9d60618231 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Sat Mar 30 15:19:24 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreemodelsort.c: revert the latest stamp increment changes,
+       as it broke stuff for trees
+
 Fri Mar 29 18:09:18 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkaccelgroup.c (gtk_accel_group_query): Call 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index a90b6b16af63ec8d8e6164e3b18054dcc6ef1753..115aeca8fa0b779b3c2f8ce8d785aa9d60618231 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Sat Mar 30 15:19:24 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreemodelsort.c: revert the latest stamp increment changes,
+       as it broke stuff for trees
+
 Fri Mar 29 18:09:18 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkaccelgroup.c (gtk_accel_group_query): Call 

diff --git a/gtk/gtktreemodelsort.c b/gtk/gtktreemodelsort.c
index 6b2a8cc3086578103338a8c2195275c1a8eb6c96..1869090759bb25a926bfb4fb6ddc95633de39f0a 100644 (file)
--- a/gtk/gtktreemodelsort.c
+++ b/gtk/gtktreemodelsort.c
@@ -804,6 +804,7 @@ gtk_tree_model_sort_rows_reordered (GtkTreeModel *s_model,
 
       gtk_tree_model_sort_sort_level (tree_model_sort, level,
                                      FALSE, FALSE);
+      gtk_tree_model_sort_increment_stamp (tree_model_sort);
 
       if (gtk_tree_path_get_depth (path))
        {
@@ -1534,8 +1535,6 @@ gtk_tree_model_sort_sort_level (GtkTreeModelSort *tree_model_sort,
       gtk_tree_path_free (path);
     }
 
-  gtk_tree_model_sort_increment_stamp (tree_model_sort);
-
   /* recurse, if possible */
   if (recurse)
     {